OCPBUGS-62869: disable metrics auth for hypershift clusters by deads2k · Pull Request #1242 · openshift/cluster-version-operator

deads2k · 2025-10-08T23:15:46Z

CVO does not honor client certificates per the OCP metrics standard and HCP does not configure the secret. The combination of these two things means that on HCP, if we enable the CVO's auth handler, we lose the ability to determine if clusteroperators are functioning correctly at scale.

/assign @wking

…obot/cherry-pick-1222-to-release-4.18" This reverts commit 78df707, reversing changes made to 94c0e70.

…robot/cherry-pick-1222-to-release-4.18" This reverts commit 92dd0b2.

CVO does not honor client certificates per the OCP metrics standard and HCP does not configure the secret. The combination of these two things means that on HCP, if we enable the CVO's auth handler, we lose the ability to determine if clusteroperators are functioning correctly at scale.

deads2k · 2025-10-08T23:16:26Z

+	if disableAuth {
+		handler := http.NewServeMux()
+		handler.Handle("/metrics", promhttp.Handler())
+		server := &http.Server{
+			Handler: handler,
+		}
+		return server
+	}


this is the code prior to #1223

wking · 2025-10-08T23:19:41Z

 						go func() {
 							defer utilruntime.HandleCrash()
-							err := cvo.RunMetrics(postMainContext, shutdownContext, o.ListenAddr, o.ServingCertFile, o.ServingKeyFile, restConfig)
+							disableMetricsAuth := o.InjectClusterIdIntoPromQL // this is wired to the "--hypershift" flag, so when hypershfit is no, we disableMetricsAuth


You have direct access to o.HyperShift here, so you can just use that instead of creating a local disableMetricsAuth variable, without having to touch o.InjectClusterIdIntoPromQL

I don't think o.Hypershift exists on 4.18. I found this https://github.com/openshift/cluster-version-operator/blob/release-4.18/cmd/start.go#L48

wking

/lgtm

openshift-ci · 2025-10-08T23:35:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

deads2k · 2025-10-08T23:42:35Z

/hold

hold so we can get all the releases ready and finalize tomorrow.

openshift-ci · 2025-10-09T02:18:31Z

@deads2k: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

wking · 2025-10-09T03:19:48Z

/jira cherrypick OCPBUGS-62868

openshift-ci-robot · 2025-10-09T03:19:58Z

@wking: Jira Issue OCPBUGS-62868 has been cloned as Jira Issue OCPBUGS-62869. Will retitle bug to link to clone.
/retitle OCPBUGS-62869: disable metrics auth for hypershift clusters

Details

In response to this:

/jira cherrypick OCPBUGS-62868

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-10-09T03:20:07Z

@deads2k: This pull request references Jira Issue OCPBUGS-62869, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected dependent Jira Issue OCPBUGS-62868 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

CVO does not honor client certificates per the OCP metrics standard and HCP does not configure the secret. The combination of these two things means that on HCP, if we enable the CVO's auth handler, we lose the ability to determine if clusteroperators are functioning correctly at scale.

/assign @wking

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

deads2k · 2025-10-09T13:43:10Z

/hold cancel

sjenning · 2025-10-09T22:19:42Z

/verified by @sjenning

openshift-ci-robot · 2025-10-09T22:19:55Z

@sjenning: This PR has been marked as verified by @sjenning.

Details

In response to this:

/verified by @sjenning

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

wking · 2025-10-09T22:24:50Z

/label backport-risk-assessed

deads2k · 2025-10-13T14:31:16Z

/jira refresh

openshift-ci-robot · 2025-10-13T14:31:26Z

@deads2k: This pull request references Jira Issue OCPBUGS-62869, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.z) matches configured target version for branch (4.18.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-62868 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-62868 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
bug has dependents

Requesting review from QA contact:
/cc @jiajliu

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-10-13T14:35:44Z

@deads2k: Jira Issue Verification Checks: Jira Issue OCPBUGS-62869
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-62869 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

CVO does not honor client certificates per the OCP metrics standard and HCP does not configure the secret. The combination of these two things means that on HCP, if we enable the CVO's auth handler, we lose the ability to determine if clusteroperators are functioning correctly at scale.

/assign @wking

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

deads2k added 3 commits October 8, 2025 19:06

Revert "Merge pull request openshift#1223 from openshift-cherrypick-r…

92dd0b2

…obot/cherry-pick-1222-to-release-4.18" This reverts commit 78df707, reversing changes made to 94c0e70.

Reapply "Merge pull request openshift#1223 from openshift-cherrypick-…

6a4a466

…robot/cherry-pick-1222-to-release-4.18" This reverts commit 92dd0b2.

openshift-ci Bot assigned wking Oct 8, 2025

deads2k commented Oct 8, 2025

View reviewed changes

wking reviewed Oct 8, 2025

View reviewed changes

wking mentioned this pull request Oct 8, 2025

OCPBUGS-62861: pkg/cvo/metrics: Do not require auth when --hypershift is set #1241

Closed

wking approved these changes Oct 8, 2025

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2025

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 8, 2025

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 8, 2025

This was referenced Oct 9, 2025

OCPBUGS-62861:temporarily disable metrics auth for hypershift clusters #1243

Merged

OCPBUGS-62867: temporarily disable metrics auth for hypershift clusters #1244

Merged

OCPBUGS-62868: temporarily disable metrics auth for hypershift clusters #1245

Merged

openshift-ci Bot changed the title ~~disable metrics auth for hypershift clusters~~ OCPBUGS-62869: disable metrics auth for hypershift clusters Oct 9, 2025

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 9, 2025

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 9, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 9, 2025

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 9, 2025

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 13, 2025

openshift-ci Bot requested a review from jiajliu October 13, 2025 14:31

openshift-merge-bot Bot merged commit 6944492 into openshift:release-4.18 Oct 13, 2025
14 checks passed

Uh oh!

Conversation

deads2k commented Oct 8, 2025

Uh oh!

deads2k Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

wking Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

deads2k Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

wking left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Oct 8, 2025

Uh oh!

deads2k commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Oct 9, 2025

Uh oh!

wking commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

deads2k commented Oct 9, 2025

Uh oh!

sjenning commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

wking commented Oct 9, 2025

Uh oh!

deads2k commented Oct 13, 2025

Uh oh!

openshift-ci-robot commented Oct 13, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

deads2k commented Oct 8, 2025 •

edited

Loading